Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Feb 2012 15:32:43 +0000 (07:32 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Feb 2012 15:32:43 +0000 (07:32 -0800)
commit350cbe17204345f46e9a5703f4aaca33d933b546
treed2646176c117597f227eba7b8b62f187d8977140
parentfec3d855579b9af1fdccab6875bba8f9908921c5
parent892a7ccd0e40684eaa2328bdcce7a5b9125019da
Merge from trunk.